* thingatpt.el (end-of-sexp): Fix bug#13952.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b853399e462bbebf1a42b33c0712cf880ceb3ecc..85d0d5e9c39af0767413ce58231696a33cd374d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-14  Leo Liu  <sdl.web@gmail.com>
+
+       * thingatpt.el (end-of-sexp): Fix bug#13952.
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
        * Version 24.3 released.

diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index e1e3e8e1e46d70dcae85b2b878345d0b20d50278..4fd9e2e83b2b2535b55880a543db7a2717c173c8 100644 (file)
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -182,7 +182,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
 (defun end-of-sexp ()
   "Move point to the end of the current sexp.
 \[This is an internal function.]"
-  (let ((char-syntax (char-syntax (char-after))))
+  (let ((char-syntax (and (char-after) (char-syntax (char-after)))))
     (if (or (eq char-syntax ?\))
            (and (eq char-syntax ?\") (in-string-p)))
        (forward-char 1)